bitkeeper revision 1.1159.258.170 (42b3572cZGo7alQhMs_J2gWAK56DCg)

Subject: [Xen-devel] [PATCH] allow make O=/path/to/build/dir ARCH=XEN

kbuild allows building outside the source tree. this is useful when
building multiple configs (such as privileged and unprivileged domains).
this patch unbreaks this feature for xen-linux.

Signed-off-by: Avi Kivity <avi.kivity@qumranet.com>
Signed-off-by: ian@xensource.com

diff --git a/linux-2.6.11-xen-sparse/arch/xen/Makefile b/linux-2.6.11-xen-sparse/arch/xen/Makefile
index 378dba9615ddc28fae8c9b3c210438cecac2657e..159006083dca20ffa59e86d56ef268edd92cedb5 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/Makefile
+++ b/linux-2.6.11-xen-sparse/arch/xen/Makefile
@@ -27,15 +27,17 @@ include/.asm-ignore: include/asm
        @mv include/asm include/.asm-ignore
        @echo '  SYMLINK include/asm -> include/asm-$(XENARCH)'
        $(Q)if [ ! -d include ]; then mkdir -p include; fi;
-       @ln -fsn asm-$(XENARCH) include/asm
+       @ln -fsn $(srctree)/include/asm-$(XENARCH) include/asm
 
 include/asm-xen/asm:
        @echo '  SYMLINK $@ -> include/asm-xen/asm-$(XENARCH)'
-       @ln -fsn asm-$(XENARCH) $@
+       @mkdir -p include/asm-xen
+       @ln -fsn $(srctree)/include/asm-xen/asm-$(XENARCH) $@
 
 arch/xen/arch:
        @rm -f $@
-       @ln -fsn $(XENARCH) $@
+       @mkdir -p arch/xen
+       @ln -fsn $(srctree)/arch/xen/$(XENARCH) $@
 
 arch/$(XENARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
                                   include/config/MARKER